Added some configuration options