More functionality added to command line.