X-parameters [1-4] are the mathematically correct supersets of S-parameters valid for nonlinear (and linear) components under large-signal (and small-signal) conditions. This work presents an automated application combining a Nonlinear Vector Network Analyzer (NVNA) instrument with automated load-pull measurements that extends the measurement and extraction of X-parameters over the entire Smith Chart. The augmented X-parameter data include magnitude and phase as nonlinear functions of power, bias, and load, at each harmonic generated by the device and measured by the NVNA. The X-parameters can be immediately used in a nonlinear simulator for complex microwave circuit analysis and design. This capability extends the applicability of measurement-based X-parameters to highly mismatched environments, such as high-power and multi-stage amplifiers, and power transistors designed to work far from 50 ohms. It provides a powerful and general technology-independent alternative, with improved accuracy and speed, to traditional large-signal device models which are typically slow to develop and typically extrapolate large-signal operation from small-signal and DC measurements.