Refactored out getDecision parameters in place of the GroupChoice class.

Update required