Convert to use SwiftCoreDataHelper