Generalize for any field instance, fix typo and sleep longer on upload