DB storage rework