Making sure that heartbeats are used as a source for detecting endpoints
Cleaned up the endpoints list