Updated for 0.8.0