Added typ for hsaId and logic for age groups.