Added Window and Language Controllers