Added CFG token expansion to dialogue unit