changed dependency injection format