Adding the remaining fields based on feedback.

Signed-off-by: Joe Whitsitt <joe-whitsitt@uiowa.edu>