Changed plugin to match new plugin heirarchy