Added framework for data retrieval