DI changes to support minification