More WebFlow changes