Update to Flow 0.4