Replaced all occurrences of String class with SafeMarkup equivalent and updated the usage declarations