Change to allow forward references to tasks