Mazen to create sub-issues to cover: <img width="520" height="64" alt="Image" src="https://github.com/user-attachments/assets/60215bab-222d-42c7-8b4f-b15262dbedb6" />
