Handle Ref

Change-Id: Ifbe6abda2d310e19a9ea0ceda15ded8065e22409