Improving old code
Made LocaleDAO
Small changes