COMP: Use const correct parameters in DataStorage methods