Refactoring object manager and descriptors