Updated the command discovery