@davidflanagan Agreed, it's much cleaner and simpler approach. Updated the PR with your inputs. Thanks