Modified rest endpoint