Modify cli generator