Added Core Data Support