Improvements on export functions.