db storage rework