Added remaining localization code