Should this be at the module level instead of called with each task?