Even more IoC wiring up