DependencyInjection internal simplification