Added validation for command options