Completed Functionality for Export