Move ivars to class extensions