Bring in IoC changes