Better handling of CAMF data