Updated core data to eliminate slow save