Adapt to 0.8.0