Create models and mappers, fixed typo