Support 0.12.0