improve service dependency injections