Updated to of0.8.0