Move service_injector into feature branch