Add support for more 'commands'