Improve language saving