Adding some more config options