Added proper argument handlers
Patched validation script, now it is working