Refactored some object creation methods to repository manager