Add support for multi commands