Changed DataStorage reference