Add back the layout identifiers that were lost in conversion