Further rework of base schemas