Use proper Change object detection in client