Dependency injection issues resolved