Add CVS diagnostic & improve the CLI inteface