Progress towards 0.9.0 support