Update to support new SAP NW Gateway demo system