Added some default configuration options