add per-command validation