Add new command line options clustering and role