Add missing fields in server handler