Changed EndpointListener to follow the same patter as other listeners in package. Was a bit of a fragile special case.