Updated Autofac and Grace