Added Configurator and Locale Aware Formatting