Updated for new plugin versions