Update to be compatible with 0.11