Added configuration switches for the new feature.