Changed conventions and transaction API to be fluent