Generalize endpoint extension

can be removed ;)