Adding support for additional command line options