Beefed up the Data class