Added DI container to more classes