Added more localization features