Refactoring HelperManager