Updated for the 3.0 release.