Split into separate CLI feature set