Dependency Injector Interface restructure