Implement code changes to enhance functionality and improve performance

[IDev456]

No description provided.

[unocelli]

@IDev456 Hi! Thanks a lot for your contribution
To help with the review process, could you please add a description to this PR?
It would be great if you could include:

• The purpose of the changes
• What functionality has been added or modified
• Any steps to test the changes or relevant impacts to consider
  Also, please consider updating the PR title to reflect more clearly what the changes are about (e.g. which feature or functionality has been improved or added).

Thanks again!