Updates to retrieving method