Improved dependency injection strategy.