Updated to use new group option