Optimal Nonlinear Pricing with Two-Dimensional Characteristics