Restructured schema