Modify variables order in partition_for_transaction