Added support for Plugins