Changed endpoints to avoid URL conflicts