Add GroupType enum for choice and sequence + property