Changes for new version of plugin bundle