Added some Config Options (WIP)