Further migrate to reference