HCOLL-167 refactor around the transaction id