Updates to CBW plugin.