Add more fields to the mappings