Description

Refactoring the PZ SIC and trying to improve the logic of the code in few places.

News snippet

Code refactoring

Checklist

I have checked that my code follows the Octopus coding standards
I have added tests for all the new features added in this request.