+ Added validation everywhere in cli