Handle endpoint selection explicitly