Added more robust command options