Aligning with the new ER model