Redefined Data class and renamed to DataRow