Added some configuration changes