Added copy_payload layer
Did some changes