Added more 1.8 protocol stuff.