T147 - ASPCA - Adding token support to PSI gateways for custom field values