Contextual Escaping methods to Escape class

added contextual escaping methods to Escape class with diff friendly changes