Reworks the transaction macro to accept a map of options
Removes the isolated macro