Change endpoint
Fix bug
Add clientToken