Fixed many mappings for the models and data models