Attempt to restore 2.1 compatibility

Attempt to restore 2.1 compatibility by using old Trigger interface (deprecated)

Test for new Transaction class to determine if the transaction object has the correct OriginId() method.