Some changes on the database models