Updated all plugins to new Data structure