Added support for command plugins