An Improved Two-Phase Model for Hydraulic Jet Pumps