Add validation on changing commands