Update to support 0.10