Added configuration for whether