Move metadata stuff to save upload