Mazen to create sub-issues to cover: <img width="520" height="95" alt="Image" src="https://github.com/user-attachments/assets/f131cf13-7e2b-4ee0-9387-7c941e4ed0bf" />
