Added some command line app (CLA)  features