change Identifier from group to type
refactor to support proper separation on tax household, eligiblity