Re-add refs for wafers