Rearrange combined schema to use refs