Initial draft for 2.0 cli support