updated to use automapper