Support for custom commands