Added additional fields that were missing

Added additional fields that were missing