The Evolution of Optical Water Mass Classification