Added extra fields