Add automaper. Refactor code to using automapper