Move the task calls outside of the transactions