Fix token structure