Changes to handle data retrieval.