Added support for command types