Renamed class, updated documentation