Updated DataStorage with commenting