Added Arabic support