Add some utils to cli-base