Upgrade to new Plugin API for decoration