Updates for 0.9