Update to add group ability