Language Fix
Language refactoring Part I