Adding index, forgtten include and fixes for group removal and addition