Added cli script support