Added basic export capability