Now using dependency injection.