Added combo token support
use + instead of | for combo tokens
test update