Support for v0.11.x