Added IoC infrastructure