Added more support for flex-flow