Adding locale support