Added a few more mappings