updated modules; fixed mapping conflicts between modules; added new mappings;