Switched from array to SplObjectStorage
Renamed storage to items