Allow transactions with transaction generating functions to be queued
Add indexes and timing data