Some preparation for upcoming Localization changes