Rework of the Database model classes.