CLI improvements