Added extra fields for updating