Add remaining fields to response/request parsing