Added a couple more config options.