Added support for commands.