better support for plugins