Completly moved control of services to the custom class