Add support for commands