Adding CLI tools