Add support for new exports