Add initial table mapping, DB model refactor