Improved Injections and refactoring; Add initializers;