Schemas rework in progress