Keep working on alignment to new ER model