Improved to allow optional command line entry