Add more mappings