Fixed CalcIdChangeSet to handle new structure... structure.