Upgrade to use paogn/cli library