Added DI to entire code base