Added --watch and --no-plugins