Improved new Config system, started switching engine to it