RF2 export composite key refactor.