Add possibility to compare the current state (and track)