Added some class structure for the data wrapper classes.