Added a few more config options