Refactored AutoFac IoC container to remove duplication