Added Internationalization classes and logic