Changes to file retrieval