Migrate plugins to new data system
merge