Updated with flow tags