Added some more commands. Moved querying of supported commands into separate function