Service Dependency fix for generic type dependency