Format data
Improve the retrieval