Changed the configuration part