Updating to core to 1.0.7