Added export functionality