Update to 0.11 API