Moved token to header