Refactor DB schema