Added optional group feature