Added support for hot_service_dependency
Cleanup and light make up