Added support for most commands