Now using dependency injection