Added Core Data support