Some more work on IQL workflow