Refactoring to remove Draft/Branch and replace with Flow