Refactored Automapper and Autofac