Added MapModule to the merge and subsequent changes.