Use tokens properly