Added support for plugin.name and plugin.url