Enhanced command line options