Deadlock retry implemented; remove TODO
Expose helper builder