Updates to check node Id in transactions