Completed introduction of automapper