Changes for file retrieval using dynamic location