Added support for custom commands