Updated Data class