Refractored Manager