#2325 : Add  support for Helpers update