Add preliminary command line argument support