Added some more configuration