Updated support for Renewal Preview