Added more localization support