Rewriten endpoint management into Class