restructured schemas