added support for commands