Fixed refactor of exports.