Theoretically added the remaining endpoints.