Refactored manager to fit in with core code