Added a timeout to storage helpers