Modifying affinity-transaction-group definitions

Modifications to consider before providing affinity-transaction-group definitions to the Builder.