More extra fields support