Make Token a struct again