Added some configuration stuff