Added a few new mappings