Add missing fields in server handlers