Update to be consistent with v0.6.0 release