Add Locale settings
Optimise imports