More and more updates to storage...