Adding more functionality to addflow