Updated command validation