Update to core 0.9