Re #1007 : Added extra fields