updated Data class