Fix mappings
Update configuration