DTF workflow improvements