Add Data fields to remaining elements

Also export_all converted to export, and add function specs