changes for timeout callback and datastore migration