More work on data upload