Implemented Manager class and refactored accordingly