Updated existing plugins to work with new plugin structure