more updates to use automapper