Code updates to v0.6