Partially upgraded to 0.9.0