Break out resolvers, and change from URL to Endpoint