Move back to Class Accessor compatibility