Renaming modifiers -> flow, adding race