Helpers refactoring
Merge pull request #698 from a-chumagin/ExtendedHelperManager

Helpers refactoring