String replacement added