Changes for core data