Add ability to specify extra command-line arguments