Improvments for the new storage-structure