Added cli capability