Improve transaction and entry ordering