added support for custom command definitions