Added ability to use command-line arguments to load plugins in more
cases