@ctomc  I did my change in similar way like the older changes was done in this subsystem.
Thanks for your comments, I will take them in.