IoC container

Made some changes to the way the IoC containers are instantiated.
Minor changes