added the handling for extra fields