Modify Endpoint interface