Enhanced Water Market Dynamics