Make model reflect the database [RD-70]