Refactored url and file resolvers