Added more cli options

Change-Id: Ieb01373de10f0ba3a90ce64d1c41871d9b96a1ed