Added primary diagnosis and inclusion categories