Add support for command