Updated plugins to remove global values