Set progress fields as optional as they're not returned if not progress was set