added support for "tokenDelimiter"