Separated YATSM from CLI script