Add single command support