Update to contextual data retrieval