preparing to refactor DB scheme