Fixed storing hashes instead of storing objects