More updates to get subentity sets loaded into Core Data