Added more protocol/data classes.