Changed ERD structure