Changed db tables and entity model