Changed CLI parameters scheme