Utilize the new endpoint class