Yes make sense @rkoller. I have made the necessary changes in the MR.