Applied ERD changes