Added export capability