added some new mappings and modules