Continued work on timeout persistence