Added support for plugins