Updated app/storage