Better token handling
