Support content elements reference update

Updated to support both structural and content elements reference update