Updated with v0.6 notes