Upgrade to new plugin deployment way