More modifications to integration plugin.