Add optional labelling to EndpointView