Added a MapperFactory