Add Group Controller Support