Renamed class
Added __hash__