Refactor mappings class, create MapperFactory