Refactored group functionality into generic class.