Corrected usage of options
Argument building
Argument validation removed