DB ERD updated, to be reviewed