More language var loading refactoring