HOPKINS: Some refactoring in ObjectsManager