Please review the change if this is what expected.
@Aravind22 Thanks for the PR. You may a few more issues here.