Added in more config options