Update for 0.8.7