Complete configuration rewrite, massive optimization