Generalize endpoint extension

: {