Minor changes in Interaction and Mapping Modules