Move from clihelper to helper