Added extra fields from espace