Update data exports and make more automatic