updated DataClass