Replaced OrgType for a Tagging mechanism