Configuration restructured.