Added export mode