Also switch this branch back to using spHandle in export meatadata