Updates to data retrieval controllers