Replacing Transaction.withTransaction with @Atomic