Added support for arbitrary commands