Replacing os with storage