modified Data class