Updated for v0.6 release