Bring in changes to schemaPlugins