Added character string matching