Changed CLI verification