Adapt to data model changes