Added some more configuration settings