M: Refactoring db schema