Added Locale class for a better functionality