Update for 1.8 beta