Added IoC changes