Generalize endpoint extension

subFunction