Reorganized types/schemata according to #7