Renamed class name. Added abort return object