Add ability to force export