Change to avoid nested dataset lookups.