Added a few more config params