Pre ManagedObject refactor