Continued work on storage