Adding Str replacement