Restructuring around a CollectorPayload