Updated IoC Container