I will try this approach and verify, if so I will make this change.