CLI Interface improvements