Changed the configuration scheme;