#4137 More DI restructure work