Update with latest plugin additions