Rethink URL endpoints and update the docs