added support for link endpoints