Update to keep extension info in data payload