Additions to properly include all data needed for export