Updated Data class name