Added some mappings