Add more data to wrapper classes.