Added Locales and Validation