Upgrade to use v2 of plugins design