Rafactoring db/Storage in S&A module.