Efficient water management for NZE