Added --quote and --run