Improved helpers manager