All water storage options should be on the table