Enhancements in helper  class