Improved on HelpManager