Stochastic control of reservoir systems using indicator functions: New enhancements