Changes for 0.8.0 updated