Added measurement, buffer, category header and dataset header