Update fields to match latest requirements