ConfigurationHelper added, reducing data source