Added functionality for additional languages