Updated core data stack