refactoring, adding tables to the DB