Port to 0.9.0