Changes to way client parses and keep track of simulation states being
watched.