Add support for plugin.load
2.3.6