added support for Plugins in Descriptor
fixed unused variable