Added some additional configuration options