Added Data retrieval
Added full data retrieval