Added additional fields in the types