- fixed parser to use new payload mechanisms