Modify mapper policy file

This commit modifies the mapper file.  It incorporates changes made by
Andy B on his fork as well as a few changes added by Jim C on his fork.