Add payload handling and multiple header wrapping.