Dependency Injection in 2.1

Just some suggestions how to change DI in 2.1