Better token handling, better Http library