More utils
Switched to token-based auth