Added arabic support