Improved cli