Added character substitution