Changed some configuration stuffs