Convert more plugins to use new schemas
More schemas
More schemas