Replaced poor mans DI with Autofac IoC