Improved Functional Mappings via Product Preservation. (May 2018)