Added `group` feature