Changes due to ERD revisions