Improve schema table in step 2 of data upload