Is this because of JSON serialisation as well? Really has to be done separately, we can't go around carrying this update dependency.