Water Right Optimization and Mitigation