Added support for new parameters for two new features.