Improved CLI a bit