Added some functionnality to CLI app.