Improvements to CLI