Rework references