work with new payload format