Updated for v3 release.