updated token handler. Fixed issue in demo client where example payload wouldn't be created