Changes to make plugin compatible with current 4.0 dev version.