Revised database model and ER diagram