Slightly improved rest endpoint