Extension to handle changes in data models