better state and meta data preservation during upload