Updated to inject new flow type