Added new age groups, modified Tuberculosis concepts