Core Data Implementation Fixed