DB refactoring new classes (WIP)