Add support for custom commands