[AJ] automapper added