Turned handlers into Services