new configuration style
added new style configuration
Merge remote-tracking branch 'origin/newConfigurationStyle'