More command line flexibility