Updating DI to better support minification