Add wait_for_changes