Add more fields to token outputs