Finishing the token annotation