Coredata model fix