Added instant language change support