Update for new features.