Better handling of extended data
Better handling of CAMF data