Refactored manager, added unit of work class