Add support for updated export protocol