Now takes arguments for single command