added CLI capabilities