Re #1112 storage refactoring