Introduced further injection
Implemented more guice
Introduced scoping