Added supported for getopt