More command validation

Moving more commands to the validation DSL format.