Updated for the latest plugin versions