Added cli mode