added automapper support