Change to URIResolver to improve performance