Added Arabic support (to be tested)