Renamed class, added reef visitor