Added group object, made channel fields optional