Add support for optional command-line arguments