Adding some flow builder stuff