Adding reference-only fetching