Continued work on timeout persister