Add/Modify/Remove Endpoint

Please help control endpoint tool modifications.