Changed usage of SplObjectStorage to ObjectSet