Made the Dependency Injection implementation into Constructor Injection.