Updated Data Classes