better Core Data integration