ModelUploader update to handle new behaviour