Updates for matching more character classes