Allow inclusion of additional fields

Change-Id: I10ac5a9b91ae35af5c8277d06823af869b3226fc