New functionality into CLI