HOPKINS: More refactoring in ObjectsManager