added back additional fields