Removed the usage of the Locale Enum