Added additional fields