Added support for external exports