More progress on creating export tables