Updated plugins to new plugin architecture