Added -disk and -private options to cli