Added initial timeout persistence scaffolding