Better handling of dynamically changing endpoints.