restructured schema