Proposed changes more inline with DI philosophy