Added dollar and percent sign tokenizers