Re-writing exports