Add adjustable timeout and repeated saves for slower systems