Disjointed the services to more handlers