Rewrite dancer2 cli #371