Updated to include OF task creation