added support for multiple token fields