Added a few more config variables