Added some more mappings