Added support for endpoints.