Added automapper logic