Refactored to new plugin ids