Modified with Core Data
With Core Data implementation