Rewrite Endpoint Master