Line up with adjustments to the data model