uploader: enhance field definitions