Add some more mappings