Updated doc, added more methods for retrieval