Add missing fields to buildFormat, now that we can