Added support for Product  GPS Mappings