Updated CoreData Control