[Enh] Change model for core data