Add new command line options for clustering and role