Rework storage, fixes #59