Add basic data retrieval