Added support for command identifiers