Improved cli support