Made 0.6 to 0.7 language changes