Updated for latest plugin schema