More work on nested payload support