Added some more configuration stuff.