Merge "Move to using ClassAccessor"