Hello rthik007,
I believe your edit is accurate, as you accounted for the regional way classifications.
Happy Mapping,
Contoured

Hi Saif alhattali, thanks for mapping!
I noticed here (changeset/103948036) that you used نادي العاصمة للفروسية +971501222551 as a residential way name tag. The OSM community refrains from adding business names and phone numbers as road name tags. Please checkout the following sites to aid in proper tagging methods:
name=*
https://learnosm.org/en/beginner/
Thanks, and let me know if you have any questions!
Contoured