Final changes to initial db and ORM structure