Restructured configuration